Auto merge of #3608 - matklad:simple-cli, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 30 Jan 2017 17:36:44 +0000 (17:36 +0000)
committerbors <bors@rust-lang.org>
Mon, 30 Jan 2017 17:36:44 +0000 (17:36 +0000)
Simplify cli-handling functions

This simplifies somewhat roundabout `main` in `bin/cargo.rs`.


Trivial merge